Skip to content

Gmoccapy: Move offsetpage buttons to table frame, add toggle button for calculator use #3690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
Sigma1912 wants to merge 1 commit into
base: gmoccapy-3-5-2
Choose a base branch
from
Open

Gmoccapy: Move offsetpage buttons to table frame, add toggle button for calculator use #3690

Sigma1912 wants to merge 1 commit into from
+108 −88

Conversation

@Sigma1912
Copy link
Contributor

@Sigma1912 Sigma1912 commented Jan 7, 2026 •
edited by hansu
Loading

  • calculator_use state (on/off) can be changed in tooltable and offsetpage but applies to both those tables
  • calculator_use state is retained in the preferences file (initial state is OFF)

Resolves #3513

@Sigma1912 Sigma1912 mentioned this pull request Jan 7, 2026
Open
@Sigma1912 Sigma1912 force-pushed the Gmoccapy_Add_buttons_to_offsetpage_frame branch 2 times, most recently from 11d5f44 to 6d77f68 Compare January 7, 2026 15:24
@Sigma1912
Copy link
Contributor Author

Sigma1912 commented Jan 7, 2026 •
edited
Loading

4 Axis with 'Block Height'
4axis_block
9 Axis with 'Block Height'
9axis_block
4 Axis without 'Block Height'
9axis_noblock

@hansu
Copy link
Member

hansu commented Jan 7, 2026

I am fine with this. Very handy :)
But we should style the scroll bar so that it is always shown. Currently it looks as if there is no G59.3 in the list.
And I wonder if we should keep the position of touch off buttons, so with one empty button space to the left.
But probably not. @gmoccapy ?

Before:
grafik

After:
grafik

@hansu hansu requested a review from gmoccapy January 7, 2026 18:10
@hansu hansu changed the base branch from master to gmoccapy-3-5-2 January 7, 2026 18:10
@hansu
Copy link
Member

hansu commented Jan 7, 2026

And you have been a bit too quick. Now with Gmoccapy 3.5.1 in master, you have some conflicts to solve :/.

@hansu
Copy link
Member

hansu commented Jan 7, 2026 

[Gmoccapy][ERROR]  Found an error!
The following information may be useful in troubleshooting:

Traceback (most recent call last):
  File "/home/cnc/linuxcnc-master/bin/gmoccapy", line 6394, in <module>
    app = gmoccapy(sys.argv)
          ^^^^^^^^^^^^^^^^^^
  File "/home/cnc/linuxcnc-master/bin/gmoccapy", line 193, in __init__
    self.builder.add_from_file(XMLNAME)
gi.repository.GLib.GError: gtk-builder-error-quark: /home/cnc/linuxcnc-master/share/gmoccapy/gmoccapy.glade:766:1 Duplicate object ID 'img_tool_delete' (previously on line 631) (8)

@Sigma1912
Copy link
Contributor Author

Sigma1912 commented Jan 7, 2026

Now I'm confused. With which branch are you getting that error?

@Sigma1912
Copy link
Contributor Author

Sigma1912 commented Jan 7, 2026

Seems I have rebased it on gmoccapy-3-5-2 which wasn't my intention. I'll have to sync my repo and fix this tomorrow.

@hansu
Copy link
Member

hansu commented Jan 7, 2026

Now I'm confused. With which branch are you getting that error?

Your branch, Sigma1912:Gmoccapy_Add_buttons_to_offsetpage_frame

Seems I have rebased it on gmoccapy-3-5-2 which wasn't my intention. I'll have to sync my repo and fix this tomorrow.

That's correct, I have targeted your branch to that. But it's the same as master right now.

The glade file should only contain this change:

  <object class="GtkImage" id="img_offset_calculator">
    <property name="visible">True</property>
    <property name="can-focus">False</property>
  </object>

@Sigma1912
Copy link
Contributor Author

Sigma1912 commented Jan 7, 2026

Yes, that is the only change to the glade file. Looks like I made a mistake there while resolving the conflict.

@Sigma1912 Sigma1912 force-pushed the Gmoccapy_Add_buttons_to_offsetpage_frame branch from e17a4e9 to 73fc220 Compare January 7, 2026 19:28
@Sigma1912
Gmoccapy: Move offsetpage buttons to table frame, add toggle button f…
a3fe384 
…or calculator use

- calculator_use state (on/off) can be changed in tooltable and offsetpage but applies to both those tables
- calculator_use state is retained in the preferences file (initial state is OFF)
@Sigma1912 Sigma1912 force-pushed the Gmoccapy_Add_buttons_to_offsetpage_frame branch from 73fc220 to a3fe384 Compare January 7, 2026 19:32
@Sigma1912
Copy link
Contributor Author

Sigma1912 commented Jan 7, 2026

Should be fixed now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gmoccapy gmoccapy Awaiting requested review from gmoccapy

Assignees

No one assigned

Labels

affects gmoccapy

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Sigma1912 @hansu